auto merge of #428 : garrison/cargo/patch-3, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 23 Aug 2014 18:29:10 +0000 (18:29 +0000)
committerbors <bors@rust-lang.org>
Sat, 23 Aug 2014 18:29:10 +0000 (18:29 +0000)
commit3b0983c0941a6dabff74bfa7d67d6088936cd169
tree1c3c9039e1f775db3ff94eaf00b58eaf816863c2
parent7563fba5c3425eda129a9712b165f37b710e3556
parent15732c335d41b504026499a2a28eb1c2f2d4cf0c
auto merge of #428 : garrison/cargo/patch-3, r=alexcrichton

travis-ci now supports "language: rust", which eliminates the need to call rustup.sh in .travis.yml. See http://www.reddit.com/r/rust/comments/2ecocp/travis_ci_supports_rust/ for details.

This is the same change as #425, but on the master branch in guide.md, not guide.html.